From fea50b8c981dfddbdd1ad3f25b1366e42a2b3c8e Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 6 Dec 2007 17:47:53 +0000 Subject: [PATCH] x86: Remove bogus variables on construct_dom0() The check for supervisor_mode_kernel feature bit was being done on the dom0_features_{supported,required} variables, but they are always set to zero. The feature bits are stored on elf_dom_parms struct, not on those variables. From: Eduardo Habkost Signed-off-by: Keir Fraser --- xen/arch/x86/domain_build.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index e0fb1967e2..723174fa10 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -252,10 +252,6 @@ int __init construct_dom0( /* Machine address of next candidate page-table page. */ unsigned long mpt_alloc; - /* Features supported. */ - uint32_t dom0_features_supported[XENFEAT_NR_SUBMAPS] = { 0 }; - uint32_t dom0_features_required[XENFEAT_NR_SUBMAPS] = { 0 }; - /* Sanity! */ BUG_ON(d->domain_id != 0); BUG_ON(d->vcpu[0] == NULL); @@ -942,12 +938,12 @@ int __init construct_dom0( v->arch.guest_context.user_regs.gs &= ~3; printk("Dom0 runs in ring 0 (supervisor mode)\n"); if ( !test_bit(XENFEAT_supervisor_mode_kernel, - dom0_features_supported) ) + parms.f_supported) ) panic("Dom0 does not support supervisor-mode execution\n"); } else { - if ( test_bit(XENFEAT_supervisor_mode_kernel, dom0_features_required) ) + if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) ) panic("Dom0 requires supervisor-mode execution\n"); } -- 2.30.2